Made proper icons and improved screen drawing