Improved Layout Handler, reduced set of actions, and added evaluation code