* fixes torch
* changes main layout