Added Baselines to Gui + Fixes