Some layout improvement, refactory