Changed gui formatting

Also added functionality