removed extra spaces and new layout code