Got widgets working, but still some minor bugs