Fix the issue with overlapped views, Add buttons to tables