Style improvements and adding GA