Fixed some bugs then started work on admin app