- fix app theme
 - minor layout adjustment