clean code, git rid of table layouts
clean code, git rid of table layouts