Further edited layout & compiled