code and UI merged with bornik code