Fixed some bugs. App ready for develop