fancy up ui, various fixes