Removed whitespaces
Updated layout