Reworked components and options layout
Cleaned options