Started to work on improving the UI