Cleaned up layout and stylings