Removed components etc

Fixed everything looks nicer now