Layout adjust
Added unit tests for project web