First commit - adding flat ui