Security and styling changes