updated UI and layout, new updated buttons and flipswitch icon added
Merge remote-tracking branch 'origin/master'