layout and theme rearrangements

Signed-off-by: ChampionSwimmer <android@championswimmer.tk>