Improve issues design