Layout improvements - make it look more 'Japanese'