Fixed Some Bugs and added spinner wheel widget