Cleanup gui code and refined logic

12 jobs for refactor-embargo in 17 minutes and 14 seconds (queued for 2 seconds)