focus and underline added, some schanges + forms