layout fixes, place in templates and notification