fix: cursor, border, Entry cleanup