Testing a new template + some layout cleanups