Minor GUI changes

Better layout