Cleaned up app a bit