clean up code and layout changes
cleanup layout