Fixes spacing issue, fixed height issue