Removed hardcoded dimens