General Improvements

Deleted "Close" option since there is only one window anyway