Improve page layout
Clean up commands