Added a lot of stuff and rearranged...

it looks much better!