Minor updates to Client and Main Form