Redesigning UI little bit to be more compact