Refactor styles and animation

Change-Id: Ice779da844cca9ea020cec65e6335765722ec62d
Refactor animation toggle

Change-Id: Ie53183bd0aec6fb54d85d0f7b28d8abbccdf370d