better layout and look for issue