Fixed issue: Fixed top padding and marging