Updated spacing issues