Made main app html structure a little better