pushing slider stuff for rush page
fixed merge conflict for rush stuff