Just some more layout modification
Just some slight modifications to UI