Bug fix & add title bar

UI is still ugly