Fixed column filter not showing (bootstrap.js was incuded twice).
Adjusted edit behaviour inline with Majids comments.