Updated table view for better size constraint and layout