Layout fixes and removing unneccesary content