#Issue619: UI fixes for iPad alignment

Low priority, will complete the code review later.