Revised and cleaned up styling