Fixed Layout and changed navigation.