separating design files, a few changes to the screens