Added includes and started using layouts more.