Some edits for application layout