Fixed some elements