Fixed encoding issue
Moved components around