Fixed layout and UI bugs.