Cleaned up the overall layout