Added back btn
Removing action related code
Improved sorting