Review, changing, coding
Merge remote-tracking branch 'origin/master'
Built the design and changed some loading indicators, almost all set to work