Further design improvements
Fix design