Removed unnecessary <hr>s + tweaked layouts a little bit