Add Layout and some fixes