Layout changes and deploy setup