Add focus fire
Remove useless markup and styling