Fixed Scrollbar issue, spacing issues,