added some repetition gui
moved stuff around