Cleaned some stuff up and moved things around.
Added buttons to main layout.
Tweaked some things here and there.