Revert "ubah option layout and event"

This reverts commit 457ad9b4894b5c0f56e3b0ed5362e9bd0f98ed6a.