Changed a few layout things, needs work.