Major Layout Improvements and UI Enhancement

#361