fixed small styling issue in devise
added kill switch and parent list toggle
fixed merge conflict