Fixed minor rendering issue, some code cleanup

Fixed rendering issue, updated project, did some code cleanup.