fixing some minor bugs and adding some more widget layouts