layout changes and ADD table in progress