OP-1119 Added more gui elements. Fixed layouts and alignments.