Fixes project controllers, layouts