Cleaned up hardecoded all over the template