Here is your initial design:

Your revised design:

Final Revised Design (night scene with lighting)