Building screen working again. Fixes #36