Small ui fix, still needs CSS for small screens
More bug fixes