Changed GUI to fit together with annex part