Adding settings layout and Notification code

Signed-off-by: anfor <ainhoamm85@gmail.com>
Merge branch 'master' into ainhoa