Refactor + Fix not showing on macintosh issue