Add HP bar and some restructurization