UI Imporovements and spacing