restored and redone security app
fixed merge conflicts in shared stylesheet