[Layout]: finalizing improvement...
[layout]: removed old actions