[FIX] UI Improvements: Alignment fixed across the client