clean up
security and styling