where should the fucking favorites button go
fixing bug for refresh list
Fix merge conflicts
Merge branch 'formatting_splashes' into development