Fixed various sizing issues