Revert "Revert "GUI improvements and GA completion""

This reverts commit 688f8034d98dcbaca35495c4f8729f6a8a13fa22.