Implemented discussed layout changes