Cleaned up, fixed and changes some layout jazz.
small fixes