Solving layout and denied page
Merge changes