Reorganization of layouts
Support for 24 hours mode selection