Worked a little on UI