Added layout & fixed errors