app looking good. Splah and setup page great. Working on app page.
Fixed style merge conflict