Style changes, remove amplify, finish add layout