Updated layout and fixed forking controller & model