Fixed some design issues
Small Layout fixes