Layout and some modifications