Fixing layout and some UI bugs