->update layout
->various bug fixes and changes