Move to table layout, makes it a lot easier for layout