fixed table layout and some generic issues