UI improvements filterset and other adjustments

Conflicts:
	app/views/application/_footer.html.haml