src: minor refractor
src: implemented notifications, TODO test and Layout overhault