More updates! Fixed some dynamic element issues