Little Fixes (styling and ordering)