Refactoring for consistency and small layout fix

Fix to layouts to make Note/Warning boxes appear