Fixed alignment and added notification setting show/hide