Added better widgets