improving ui and drawing capabilities
merging from master