Re-sort/order some styles and add basics for table view