fixed tabular view + edit functionalities