Updated functions and styling