Layout added w/ yield, redirect fixed, nav link removed

Merge merge merge. Cleaned up the views using layout w/ yield, and other things.