Changed structure and fonts