updates to logic and styling