Improving structure. Adding screen aliases