CSS Fixes and Attempting to neaten Owner code