Modified layout and ui