More work on the application page