Redo sidebar a little, square up things, spacing