Keep the content of the table structure page until editing page is loaded

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Eliminate duplicate code

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Merge branch 'QA_4_3'