Improve screen layout, and some code formatting changes
Code formatting changes