more proper ui layout, but still missing lots of stuff