Looking very good…!
One question occurred to me - why you decided to place the amber ‘lights’ (for Off/On) beside the switch to the right, instead of (where I’d put them) above it…? Just feels/looks a little ‘not comfortable’… maybe there are constraints… maybe, its just me.! 
Bob