Some quick fixes for some UI bugs, more needed possibly for small screens. Tablets may need some bigger UI pieces