Mostly styling and some workflow improvments