More work on the focus and history styles

Signed-off-by: Torrey Rice <rice@itorrey.com>