Some UI changes along like applied Bootstrap