Code cleanup and first part of user text option/UI