GUI forms updated to look like DB