Fixed components

I don't think I'm using them appropriately... I GOT TOO EXCITED!