Minor UI changes

Just some minor UI changes so that the UI does not completely crash