Overhauled styling minus drawer and modal