More solid ui and workflow