Changed spaces to tabs and added UI