Angular improvements, code is still a mess